Fix a typo, double definitions; MakeFile changes