Fixed warning
Fixed more warinings.