Bug fixes, release 1.0.1