Minor updates for Kraken compatibility