Some warnings fixed