Fix referencing non-existant structs