Minor changes from ref version