Fix some EFFF UBL issues