Changed Makefiles to work around OpenPA building problem