Fixed structures issues