Fix require/provide-related problems