Fixing issues
Bug fixes