Edits to accomodate Vaadin 6.