Minor changes for 1.0 release