Some minor fixing