7/15 Changelist fixes