Some more minor in-workshop edits