Fixed messages
Fixed pg