[Fixed] some minor bugs