Fix Edit Values Issues