Have a wide-angle lens (not an ultra-wide, but a wide lens). For instance, in my camera bag, I have a 24mm wide-angle lens. It's wide enough for most scenarios and you have little distortion around the edges. 16-35mm is great, as long as you stay away from 16mm.