removed various warnings