Don't leak keys
Slight path change (for go stuff)