Update XIDs and fix warnings