Element update issue fixes