Thanks for posting the errors and fixes, that’s very helpful for others in the future.
BTM branch is currently behind as its not compiling correctly. It’s a task in the Sprint list for @SysAdmin. That’s likely to be why you see errors.
Our current live branch which is working is deploy-phm which is where we are building and trying out updates.
The longer term plan is to have master as a staging server and all updates pulled down to the live platforms once a month, but for now we can carry on building on deploy-phm