Checkin some previous changes