fix double embedding and pointers in general