Build optimizations

Conflicts:
	Makefile