Fix warning msgs.