adjustments after uberfire merge