More fixes
Merge pull request #7 from NielsZeilemaker/move_initiate_meta_messages

More fixes