Fixed issues
Issues fixed