Some changes to fix everything.