Trying to make shipable happy