Take 3 fix Cask issues