Fix some issues for version 1.0.5