Minor cleanups
Force -SNAPSHOT suffix for non-tagged versions