Fixed UG compilation problems