Fix up more require statements