Minor fixes after testing with WordPress 3.9 multisite.

git-svn-id: https://plugins.svn.wordpress.org/embedder/trunk@906103 b8457f37-d9ea-0310-8a92-e5e31aec5664