More builder work

Signed-off-by: Marco Costalba <mcostalba@gmail.com>