Fixes for testing of config build.