Minor fixex for release. Release v2.