Fixed some structure issues