More changes that got lost in svn-->git