FIX: Browser optimizations