Some variable weirdness to hopefully fix.