Fixed struct declarations