More PlayerControl cleanups