More 8.1 support