More missing structs/compile issues