Various fixes for config