More v1.5 updates