Minor tweaks
Calling closures now need explicit deref