Fixed some warinings