Compatibility tweeks when testing on API10