More build flag tweaks