Fixed packaging issues and removed un-necessary patch to the Makefile