Connect signals in better places to stop wrong value saving.