Minor fixes for version 1.0.1.0