fix up BuildConfig
fix some failing functional tests