Fix compile errors from previous commits