Update Fix Issues