Fixing AppProps