more embedded handling improvements