Improvements found while JB was marking