Some fixes according to snapshot feature