BUILD FIXES ROUND 1