Two small bugs...