Minor BaseBlock adjustments