Final fixes for 2.0 update
Bump version