Minor workspace changes