Little changes in Makefile & Co