More 5.1 fixes