Minor changes, checkin for test