v1.0.1 Bug fixes