several warnings removed