Fixes

Few fixes