Fixing issues submitted