Fix errors found during mksnapshot execution