Small fixes to recent config changes