More Build Fixes