Some structure fixes
Some structure fixes