Fix up MA6 issues