MOre accidental revert issues fixes