Update to v3.0.1, minor bug fixes