moar fixes, theres prob a better way to do this but meh...

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