Minor improvements/fixes in prep for 1.2