Small fixes client