More tweaks to BuildConfig.py