Fix more requires;