on publish fixes