Fixed warnings from tools
Fixed some warnings...