Fixing compiling issues with Vaadin 7.3

Fixes issues #1