Fixed warnings/errors