minor changes for builders