More actor fixes & updates