Fixed a few unnecessary warnings