MOM-6 a few little fixes