Bug Fixes in 2.0