Fixes for latest cheshire update