App bugs fixed