Refinements to last commit