additionnal bug fixes to the client