Small refinements and adjustments