Undid some final classes and methods - they don't play well with GWT