De-GC a bit and optimize and fix build