adjustments for vaadin 7 migration