Hot fixes from corporate repo

Updates from svn