Additional adjustments, as well as killing a few compiler warnings