Fixes breaking changes in nightly

Closes #688