makestruct: fixes