Fix warnings
Add ALL the keys