Fix build errors from 8636563aec52f75f044a486b7335a94f52429e58