Fix build errors from obsolete references