Small internal tweaks