reapply missing fixes