Fix build; add Makefile