Fixes for UF0.5