More Key fixes