And fix the various complaints while we're at it Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>