Makefile/Server fix