More variable fixes