Minor adjustments for local registration functionality