Few fixes
Fixes