Minor level refinements