More changes in prep for v1.3r6