More v1.5 changes