[APP] Various fix.