Integrate comments from @dbuenzli and @Chris00