variable fixes