Small updates (and fix towards previously failed merge)