Fix pages after Toast update