Fixes for actor.