Client: minor design changes