Cleared up some warnings