Updated to compile on latest nightly