Fixes for new config variables