Fix client-side, start fixing server-side