Closures support fixes