Small fixes
Bump version to 2.0 RC3