Fix various cask issues