Added some makefile fixes for 13.04