More loader changes.