DSC-848 Fix some issues around amber actually being written to.