Various fixes, support for message_tags in comments