Fix litle bugs.