A few misc changes that I needed for some graphics-hmc stuff.