Minor improvements on multipoint