Minor fixes.

Fix some headers and allow -SNAPSHOT releases to be reflected in the RPM
names.