Update makefile, Fix compile errors.