Minor makefile edits
Merge with 3.13.2