Some fixes over Chase state