More structure fixes.