Fix CSP and comments by yxl