Fixes for Framework configuration.