Re-enabled optimization and browser compatibility