Several minor warnings fixed