Merge pull request #2657 from xmcclure/little-embed-fixes