Minor correcitons, as per @dragos comments