Further Client builder improvements.