Fix asst build errors