And moar fixes :P

Signed-off-by: Suki <suki@missallsunday.com>