Moved a few more miscellaneous things into master from embed that did not belong...