Few fixes

Few fixes....