Brought a few more types from v32 to v31 to enable deployment to SF.

Was unable to deploy to Sandbox w/o this change.