Apply the fixes requested by @tjhei in #3166.
Apply the fixes requested by @tjhei in #3166.

sairajat/dealii,kalj/dealii,shakirbsm/dealii,JaeryunYim/dealii,kalj/dealii,danshapero/dealii,EGP-CIG-REU/dealii,sairajat/dealii,spco/dealii,danshapero/dealii,naliboff/dealii,EGP-CIG-REU/dealii,danshapero/dealii,naliboff/dealii,spco/dealii,kalj/dealii,shakirbsm/dealii,EGP-CIG-REU/dealii,JaeryunYim/dealii,EGP-CIG-REU/dealii,sairajat/dealii,naliboff/dealii,shakirbsm/dealii,spco/dealii,danshapero/dealii,naliboff/dealii,spco/dealii,kalj/dealii,sairajat/dealii,JaeryunYim/dealii,danshapero/dealii,sairajat/dealii,EGP-CIG-REU/dealii,danshapero/dealii,danshapero/dealii,sairajat/dealii,kalj/dealii,spco/dealii,shakirbsm/dealii,spco/dealii,shakirbsm/dealii,JaeryunYim/dealii,JaeryunYim/dealii,shakirbsm/dealii,EGP-CIG-REU/dealii,naliboff/dealii,JaeryunYim/dealii,JaeryunYim/dealii,kalj/dealii,spco/dealii,kalj/dealii,sairajat/dealii,naliboff/dealii,naliboff/dealii,shakirbsm/dealii,EGP-CIG-REU/dealii