Added ref and fixed overly-long refs