Address some comments from @s1monw