Fixed warnings associated with update code from previous revision