Fixing various require problems.