Makefile, spec updates; other minor fixes