Fix app variables