Fix some minor bugs...