cleaned up various warnings