Schema fixes related to AM and PM delete APIs