A few quick fixes for publishing
Merge pull request #681 from isuftin/master

A few quick fixes for publishing