Fix Makefile/solution