Better X-Frame-Options handling