Checkin, random fixes.