Fix compile errors from last night