Updating build support and nsb