More loader regression fixes