Fix some builds after r234516