Small bug fixes in Makefile and GPU selection