Small fixes

Small fixes
revert