Makefile adjustments
GCC 4.8 -O3 fixes