Added some items suggested by Arne and an issue commenter