Fix some issues with parameter resetting during updates