Some minor fix