Fixing compile errors. Updating Makefile.