Fix PM messages & new markers