Fixing embedded objects problems.