Fix the two warnings first.