Fix build scripts
Restore Makefile changes