Fixed warnings -Eric