Wallu export fixes