Fixing compilation warnings
Adding two more goals to Makefile