Fixing configure script
Fixing Makefile issues