- Minor refinements