Some minor bug fix.