Changes to prep for 1.0 RC1