Fixed issues with editing instances not retaining instance values