Fixing more broken require statements