tmp patches

(can be tested with fixed_rate 400f819)