Modified application variables
Merge branch 'variable_fixes'