more chash fixes