Allow properties to override config
Minor fixes to setting config based on props