Fix, add missing lazy evaluation dependencies