Fixing broken build; fixing Makefile; fixing constants.