Publish fixes