Minor changes to deftag