Leak canary improvements