Fixes to make calc5.cpp compile again