Fixes needed for 2.0 release