UPF update: Fix for possible warnings