More updates from SVN