minor fixes for revert commit