Update to compile with nightly