Some workspace improvements.