Fix intent handling on launch