Some 5.1 related changes