Make code compile on nightly build