Some fixes
Bug Fixes