Attempted fixes.