- Fix compile issues caused by previous patch.