Publish fixes for opt out logic