Various updates for MoP