Fix some actor issues