Some corerction for removng warnings