Fixes for the Fin version with client-server