Fixed some issues with confusing update contents