Minor fixes to allow for user specific overrides.