A few more small tweaks to get embedding working