Some small fixes of v1.0.7