More UOL improvements