Rework validate_base_change