Fix handling of surface flag in aven export code