Minor tweaks to make embedding a bit less painful