more fixes

Signed-off-by: callum <callumt47@hotmail.co.uk>