Fix somes build errors