minor build changes from previous source commit