commiting small changes before big upgrade to 2.3.1