Fix compile errors caused by changes in base-4.7.
Merge pull request #46 from 23Skidoo/base-4.7

Fix compile errors caused by changes in base-4.7.