fixed various warnings