UBI: misc comment fixes