Multiple fixes, includes remaining SVN patches.