Makefile fixes (thanks Timur)