Minor fixes. Prepping for 3.1.5.