Fixing snapshot/restore and status reporting