Some minor adjustmensts