Revert 1 minor fixes