More fix to wbd cmake