Updated to match 1.2 release

Minor changes