crucial build fixes thanks nik3r