Fix make ordering