final fixes after hydration removal