some warnings fixed