More refinements with errors etc