Checkin for the most recent fixes.