Couple more fixes
Merge pull request #5 from NielsZeilemaker/move_initiate_meta_messages

Couple more fixes