Resolved some more Set-Cookie warnings
Land #3359, more Set-Cookie fixes