Minor fixes for 2.3.1 version.