Revert a couple of changes
Fixes

fixes