More issues clean up