fixes for embedded fields