Removed a few varnings that Clang was constantly reporting...