Fix issues in 0.3.0