correct some issues originating from variable name change