Further keyboard edit improvements