Refinements that didn't make it to last commit