building support tweaks left out in last commit