Post-merge fixes after pull request #14