Closure fixes

somo more minor closure fixes.