Minor fixes related to using ERT source code from an external project