Fixing some of the interface keys