more conservative conf + little fixes in Makefile