[DEV] UFEM: Discontinuity fixes