Fix modern make targets