Fixed app issues