More 1.5 related changes