fixing compilation errors in nightlies