various warnings fixed