Couple of small fixes
Revert "Couple of small fixes"

This reverts commit c2e85844aaafbfac98eead58bfecb460eb27981d.