fixes to broken build