Sync DEV_TOOLS

Bug fixes to build process