Refinements and fixes