Some changes in Makefile & configure