More Fixes (mostly in the client)