Minor fixes for publish