Fix global leak
Fix spec