Bugfixes, refinements for publishing