Quick fixes to build