Cleaned up a few more warnings - 4;