Improved Makefile and octo_stats_carry() functions.