Better handling of StrictMode