Message getters and setters fixed