minor build improvements