Make optimizations(with 4.8 toolchain fix)

Conflicts:
	Makefile