Fixed more warnings. Only a few left now.