clean up various warnings