Small fixes to wg