tweaks to get a clean compile of 2.7draft1 from fresh git pull