ITI-1757: Fixes for snapshot creation