[DEV] UFEM: Further discontinuity tweaks