Fixes for better experience on Firefox