More build fixes
Build 0.7.2