Few fixes
Few fixes