Fixed messages generated by Matrix package