Changes to Makefile & scripts