Code fixes as per GJ.