LPS-45539 Fix some bugs which cause some values not to be saved when the user configures them.