fixing mixed contents issues