Caster bugfixes