Hot fixes

Updates from svn