Some fixes related to the recent hdr simplifications