UX fix and FF hang fix