Fixed Makefile to work on my desktop
Fixed compile issues with server!