Some fixes in shotgun
Some fixes in nailgun according to snapshot feature