There be fixes

Yarr

Signed-off-by: Gregor Best <gbe@ring0.de>