Fix up requiring, etc.