More |app| fixes