Fix problems with chat commands