quick fixes on the client