Fixing Vaadin Issues