Dataset and variable page fixes