Fixed minor merge fallout