Closure, fixes