Found-by: ubitux
(rest of found stuff left to the author to decide which way to fix)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>