Further changes that were missed from the SVN branch.