Additional back compat fixes