Minor consistency/correctness adjustments