Some changes to compile wi