added/fixed warnings