Fix export & citation issues