Minor comments from Martin