Some structure fixes