Couple more refinements