Forgot to update lazy interfaces in last merge