More tweaks to Keshif integration