[Upg] Minor fixes