Struct and grammar type fixes