cleaning up mad warnings; thanks hbock!