Build tools updates [wip]