More keyboard related updates.