Fix internal build configuration issues