minor fixings due to revert