Just fixing little bugs...