some reversions & export flags properly