Trying to fix up some compatibility bugs.