Cleared some warnings