compile fixes, tweaked

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>