Update makefile to work around fast-forward stuff