Minor changes from SF SVN Repo.