Some more fixes for keys