fixed a pile of accumulated warnings