Fix more warnings.
Minor corrections.