4.8 makefile & fixes