Sync diffs and Makefile