pre-remapatron fixes