Fixed all client find bugs