fixes for recent cheshire changes