#93: Serialization fixes for GWT and further cleanup