fixed 30 warnings