Fix Publisher issues