Changes following deprecation of position inheritance modes