More cleanups for compatibility