fixes to make stuff compile