Remove even more warinings