Tweak cask integration further