Cleaning some warnings