Fix initial app message handling.