build adjustments: commit 9e24b9c7 follow-up