Fix up some more warnings