Few more fixes

-Steven