Revert

Revert of 2 minor changes made