Remove a couple warnings from the UI code
(cherry picked from commit 40f4b19a9b37a067d861b926d24e0d42308c33fa)