Misc cleanup in config