More fixes and hopefully ill fix the build