Address (some of the) comments from Magnus.