Fixing some data provider issues and some checkin bugs.