Changes to polymorph and actors