warnings fixed.