Fix global state

Refs #1615