Some fixes in subscriber recipe