Further keyboard improvements