Attempted fixes