Multiple fixes after broken build