Added more 5.1 related changes