Fixes for configs