Fix promise errors in Nightly