Small variable fixes