Fixed up app globals