Fixed issues with /message