backwards compatibility fixes.