Some small changes in preparation for hscan