Update vaadin version, fix minor bugs