Small internal changes