Fix Cauldron related issues. Close #118.