Small refinements throughout the paper