Fixed some more warnings. I think that's all the warnings for now.