Minor structure fixes