embedded_object fixes