Some basic changes.