Fix a bit bugs.