Nitpicks from Martin and others

https://trello.com/c/VZyC3GMx/144-martins-nitpicks