fixing cross site issues