Update to work with GWT 1.7