more 4.8.x optimizations

Conflicts:
	Makefile