Hopefully fixes to compile errors