Fix issues surrounding lazy values