fix scope for export, etc...