More fixes to config/Apply