Fixed bugs found in/via publishing.
Merge pull request #177 from xi-project/publishing-fixes

Fixed bugs found in/via publishing.