#164 warnings fixed