More 5.1 related updates