Makefile fixes. Now more Ubuntu 12.04 friendly.