Fixes to go with a change in the Commons library.