Some minor structure fixes