GWT-549 + GWT-548: corrections
GWT-549 + GWT-548: logging