commit my batch of build and spec fixes

Original commit message from CVS:
commit my batch of build and spec fixes
2 files changed