Minor fixes to structure abstraction, still
untested