No real changes to code, but confirmed 2 errors (see bug report)