Add more GC rooting (hopefully correct this time)
More rooting additions
Some makefile modifications