another round of compiler warning fixes