Some changes to fix analysing errors