Checkin and Survey minor changes