Fix Sony 4.3 regressions