- some warnings correction