Several fixes in 2.0.0