Minor update to UILib after CR comments