Minor merge fallouts