Updates from comps svn