issues and fixes