More actor fixes