Fix some more pkg-plist issues and a Makefile bug