Fixed some problems with the Makefile causing x86 compilation to fail