Fix up OAM writes