Small improvements in main::CheckInputs()