Building from the makefile, lots of stragler types fixed