Fixed some structure problems