Minor internal adjustments