Makefile bugfixes (check-if-master-branch)