Fix some issues with watch only pockets.