Fixed patch leftovers from previous build attempt