Fixed some issues with listeners for new sharing mode