Fixed defaults being overriden on startup