Minor fixes
Version bump, 2.0.0-rc.3