client: hotfixes