On your water leak, one other source of a leak may be the cab marker lights. I know my 77 C30 had that problem.