Address warning issues.