Fix event listener
Fix pub uploader to use pubserver