Some buges fix.