Fix some error for v0.3.0 modification