Update for wasanbon build