Bug fix; some requires were missing