fixes to actually make the stuff compile :)