Export: minor changes