Fix imports and basic stuff that broke.