More changes to actor code