Fixed warnings/errors wth