Fix some of the errors caused by changes in base-4.7.