fix final build errors from merge-will build now