Fixed GetMessages
cleanup