fix warnings/errors