Fix up initial key layout