Fixed a bunch more warnings