3.1.2.3

Minor "bug fixes"