Some refining here and there