key edit fixes