Fixing bugs found by the client