Fix compile errors caused by changes in base-4.7.