Fixed problems building with legacy Makefile.orig