Fix mosmetro support

Needs tests