Fixes for use of Uberfire 0.3.0