Fix unintended globals