kill a bunch more warnings!

Thanks.