Fix build for nightlies