Address assorted warnings