Updating to 3.2.3.GA and some other minor changes