more variable fixes