Small fixes proposed by @dragos