fixes to get calc master branch logging to work