Minor changes checked in for weekend.