Fixed a few more warnings