Minor Fixes to build