Some minor updates