Some changes from SVN