fixed warnings/errors