Some minor fix.