small bugfixes related to vaadin7 mostly
optimization re