Made the old compatibility stuff work better.