fix bugs for client project