Build Config Fixes