Build Fixes

Just some simple build fixes.