Fixed errors due to changes in UE