various minor build improvments