Fixes to configuration