Fixes requested by TMB.