client: Address PR issues