Apply content fixes suggested by @tborres.