BuildConfig fixes for release