Fix code.
Merge branch 'opts' into run-sketch
Fix missed make-hmap call.
Merge branch 'opts' into run-sketch