Misc cask fixes