Small fixes to EFS restore code.