Bug fixes for 2.0.1