Correcting issues on awaiting snapshot