Fixes on client