Fixes onWho bug and command handling errors