Update tweaks for recent svn, minor fixes