Additional bugfixes for cauldron